Question ambiguity is one major factor that affects question quality. Less ambiguous questions can be produced by using more specific question words. We attack the problem of how to ask more specific questions by supplementing question words with the hypernyms for answer phrases. This dramatically increases the coverage of generated "which" questions. Evaluation results show improved question quality when the question words are disambiguated correctly given the context.